Fix mixed block macros so users don't get wrong platform's macros #2494
+97
−44
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.